No OneTemporary
Actions

Size

152 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/conf/default.conf.php b/conf/default.conf.php
	index e441e130da..8895942921 100644
	--- a/conf/default.conf.php
	+++ b/conf/default.conf.php
	@@ -1,1089 +1,1093 @@
	<?php

	// IMPORTANT: DO NOT EDIT THIS FILE.
	// This file is no longer read by default, and your efforts will have no effect.
	// Follow the instructions in the documentation to configure Phabricator.

	return array(

	// The root URI which Phabricator is installed on.
	// Example: "http://phabricator.example.com/"
	'phabricator.base-uri' => null,

	// If you have multiple environments, provide the production environment URI
	// here so that emails, etc., generated in development/sandbox environments
	// contain the right links.
	'phabricator.production-uri' => null,

	// -- IMPORTANT! Security! -------------------------------------------------- //

	// IMPORTANT: By default, Phabricator serves files from the same domain the
	// application lives on. This is convenient but not secure: it creates a large
	// class of vulnerabilities which can not be generally mitigated.
	//
	// To avoid this, you should configure a second domain in the same way you
	// have the primary domain configured (e.g., point it at the same machine and
	// set up the same vhost rules) and provide it here. For instance, if your
	// primary install is on "http://www.phabricator-example.com/", you could
	// configure "http://www.phabricator-files.com/" and specify the entire
	// domain (with protocol) here. This will enforce that files are
	// served only from the alternate domain. Ideally, you should use a
	// completely separate domain name rather than just a different subdomain.
	//
	// It is STRONGLY RECOMMENDED that you configure this. Your install is NOT
	// SECURE unless you do so.
	'security.alternate-file-domain' => null,

	// Default key for HMAC digests where the key is not important (i.e., the
	// hash itself is secret). You can change this if you want (to any other
	// string), but doing so will break existing sessions and CSRF tokens.
	'security.hmac-key' => '[D\t~Y7eNmnQGJ;rnH6aF;m2!vJ8@v8C=Cs:aQS\.Qw',

	// If the web server responds to both HTTP and HTTPS requests but you want
	// users to connect with only HTTPS, you can set this to true to make
	// Phabricator redirect HTTP requests to HTTPS.
	//
	// Normally, you should just configure your server not to accept HTTP traffic,
	// but this setting may be useful if you originally used HTTP and have now
	// switched to HTTPS but don't want to break old links, or if your webserver
	// sits behind a load balancer which terminates HTTPS connections and you
	// can not reasonably configure more granular behavior there.
	//
	// NOTE: Phabricator determines if a request is HTTPS or not by examining the
	// PHP $_SERVER['HTTPS'] variable. If you run Apache/mod_php this will
	// probably be set correctly for you automatically, but if you run Phabricator
	// as CGI/FCGI (e.g., through nginx or lighttpd), you need to configure your
	// web server so that it passes the value correctly based on the connection
	// type. Alternatively, you can add a PHP snippet to the top of this
	// configuration file to directly set $_SERVER['HTTPS'] to the correct value.
	'security.require-https' => false,

	// Is Phabricator permitted to make outbound HTTP requests?
	'security.allow-outbound-http' => true,


	// -- Internationalization -------------------------------------------------- //

	// This allows customizing texts used in Phabricator. The class must extend
	// PhabricatorTranslation.
	'translation.provider' => 'PhabricatorEnglishTranslation',

	// You can use 'translation.override' if you don't want to create a full
	// translation to give users an option for switching to it and you just want
	// to override some strings in the default translation.
	'translation.override' => array(),


	// -- Access Policies ------------------------------------------------------- //

	// Phabricator allows you to set the visibility of objects (like repositories
	// and source code) to "Public", which means anyone on the internet can see
	// them, even without being logged in. This is great for open source, but
	// some installs may never want to make anything public, so this policy is
	// disabled by default. You can enable it here, which will let you set the
	// policy for objects to "Public". With this option disabled, the most open
	// policy is "All Users", which means users must be logged in to view things.
	'policy.allow-public' => false,


	// -- Logging --------------------------------------------------------------- //

	// To enable the Phabricator access log, specify a path here. The Phabricator
	// access log can provide more detailed information about Phabricator access
	// than normal HTTP access logs (for instance, it can show logged-in users,
	// controllers, and other application data). If not set, no log will be
	// written.
	//
	// Make sure the PHP process can write to the log!
	'log.access.path' => null,

	// Format for the access log. If not set, the default format will be used:
	//
	// "[%D]\t%h\t%u\t%M\t%C\t%m\t%U\t%c\t%T"
	//
	// Available variables are:
	//
	// - %c The HTTP response code.
	// - %C The controller which handled the request.
	// - %D The request date.
	// - %e Epoch timestamp.
	// - %h The webserver's host name.
	// - %p The PID of the server process.
	// - %R The HTTP referrer.
	// - %r The remote IP.
	// - %T The request duration, in microseconds.
	// - %U The request path.
	// - %u The logged-in username, if one is logged in.
	// - %P The logged-in user PHID, if one is logged in.
	// - %M The HTTP method.
	// - %m For conduit, the Conduit method which was invoked.
	//
	// If a variable isn't available (for example, %m appears in the file format
	// but the request is not a Conduit request), it will be rendered as "-".
	//
	// Note that the default format is subject to change in the future, so if you
	// rely on the log's format, specify it explicitly.
	'log.access.format' => null,


	// -- DarkConsole ----------------------------------------------------------- //

	// DarkConsole is a administrative debugging/profiling tool built into
	// Phabricator. You can leave it disabled unless you're developing against
	// Phabricator.

	// Determines whether or not DarkConsole is available. DarkConsole exposes
	// some data like queries and stack traces, so you should be careful about
	// turning it on in production (although users can not normally see it, even
	// if the deployment configuration enables it).
	'darkconsole.enabled' => false,

	// Always enable DarkConsole, even for logged out users. This potentially
	// exposes sensitive information to users, so make sure untrusted users can
	// not access an install running in this mode. You should definitely leave
	// this off in production. It is only really useful for using DarkConsole
	// utilities to debug or profile logged-out pages. You must set
	// 'darkconsole.enabled' to use this option.
	'darkconsole.always-on' => false,

	// Map of additional configuration values to lock.
	'config.lock' => array(),

	// Map of additional configuration values to hide.
	'config.hide' => array(),

	// Map of additional configuration values to mask.
	'config.mask' => array(),

	// Ignore setup warnings of the following issues.
	'config.ignore-issues' => array(),

	// -- MySQL --------------------------------------------------------------- //

	// Class providing database configuration. It must implement
	// DatabaseConfigurationProvider.
	'mysql.configuration-provider' => 'DefaultDatabaseConfigurationProvider',

	// The username to use when connecting to MySQL.
	'mysql.user' => 'root',

	// The password to use when connecting to MySQL.
	'mysql.pass' => '',

	// The MySQL server to connect to.
	'mysql.host' => 'localhost',

	// If you want to connect to a different port than the default (which is 3306)
	'mysql.port' => null,

	// Phabricator supports PHP extensions MySQL and MySQLi. It is possible to
	// implement also other access mechanism (e.g. PDO_MySQL). The class must
	// extend AphrontMySQLDatabaseConnectionBase.
	'mysql.implementation' => (extension_loaded('mysqli')
	? 'AphrontMySQLiDatabaseConnection'
	: 'AphrontMySQLDatabaseConnection'),


	// -- Notifications --------------------------------------------------------- //

	// Set this to true to enable real-time notifications. You must also run a
	// notification server for this to work. Consult the documentation in
	// "Notifications User Guide: Setup and Configuration" for instructions.
	'notification.enabled' => false,

	// Client port for the realtime server to listen on, and for realtime clients
	// to connect to. Use "localhost" if you are running the notification server
	// on the same host as the web server.
	'notification.client-uri' => 'http://localhost:22280/',

	// URI and port for the notification root server.
	'notification.server-uri' => 'http://localhost:22281/',

	// The server must be started as root so it can bind to privileged ports, but
	// if you specify a user here it will drop permissions after binding.
	'notification.user' => null,

	// Location where the server should log to.
	'notification.log' => '/var/log/aphlict.log',

	// PID file to use.
	'notification.pidfile' => '/var/run/aphlict.pid',

	// Enable this option to get additional debug output in the browser.
	'notification.debug' => false,


	// -- Email ----------------------------------------------------------------- //

	// Some Phabricator tools send email notifications, e.g. when Differential
	// revisions are updated or Maniphest tasks are changed. These options allow
	// you to configure how email is delivered.

	// You can test your mail setup by going to "MetaMTA" in the web interface,
	// clicking "Send New Message", and then composing a message.

	// Default address to send mail "From".
	'metamta.default-address' => 'noreply@example.com',

	// Domain used to generate Message-IDs.
	'metamta.domain' => 'example.com',

	// When a message is sent to multiple recipients (for example, several
	// reviewers on a code review), Phabricator can either deliver one email to
	// everyone (e.g., "To: alincoln, usgrant, htaft") or separate emails to each
	// user (e.g., "To: alincoln", "To: usgrant", "To: htaft"). The major
	// advantages and disadvantages of each approach are:
	//
	// - One mail to everyone:
	// - Recipients can see To/Cc at a glance.
	// - If you use mailing lists, you won't get duplicate mail if you're
	// a normal recipient and also Cc'd on a mailing list.
	// - Getting threading to work properly is harder, and probably requires
	// making mail less useful by turning off options.
	// - Sometimes people will "Reply All" and everyone will get two mails,
	// one from the user and one from Phabricator turning their mail into
	// a comment.
	// - Not supported with a private reply-to address.
	// - Mails are sent in the server default translation.
	// - One mail to each user:
	// - Recipients need to look in the mail body to see To/Cc.
	// - If you use mailing lists, recipients may sometimes get duplicate
	// mail.
	// - Getting threading to work properly is easier, and threading settings
	// can be customzied by each user.
	// - "Reply All" no longer spams all other users.
	// - Required if private reply-to addresses are configured.
	// - Mails are sent in the language of user preference.
	//
	// In the code, splitting one outbound email into one-per-recipient is
	// sometimes referred to as "multiplexing".
	'metamta.one-mail-per-recipient' => true,

	// When sending a message that has no To recipient (i.e. all recipients
	// are CC'd, for example when multiplexing mail), set the To field to the
	// following value. If no value is set, messages with no To will have
	// their CCs upgraded to To.
	'metamta.placeholder-to-recipient' => null,

	// When a user takes an action which generates an email notification (like
	// commenting on a Differential revision), Phabricator can either send that
	// mail "From" the user's email address (like "alincoln@logcabin.com") or
	// "From" the 'metamta.default-address' address. The user experience is
	// generally better if Phabricator uses the user's real address as the "From"
	// since the messages are easier to organize when they appear in mail clients,
	// but this will only work if the server is authorized to send email on behalf
	// of the "From" domain. Practically, this means:
	// - If you are doing an install for Example Corp and all the users will
	// have corporate @corp.example.com addresses and any hosts Phabricator
	// is running on are authorized to send email from corp.example.com,
	// you can enable this to make the user experience a little better.
	// - If you are doing an install for an open source project and your
	// users will be registering via Facebook and using personal email
	// addresses, you MUST NOT enable this or virtually all of your outgoing
	// email will vanish into SFP blackholes.
	// - If your install is anything else, you're much safer leaving this
	// off since the risk in turning it on is that your outgoing mail will
	// mostly never arrive.
	'metamta.can-send-as-user' => false,

	// Limit the maximum size of the body of an email generated for a diff
	// (in bytes).
	'metamta.email-body-limit' => 524288,

	// Adapter class to use to transmit mail to the MTA. The default uses
	// PHPMailerLite, which will invoke "sendmail". This is appropriate
	// if sendmail actually works on your host, but if you haven't configured mail
	// it may not be so great. A number of other mailers are available (e.g., SES,
	// SendGrid, SMTP, custom mailers), consult "Configuring Outbound Email" in
	// the documentation for details.
	'metamta.mail-adapter' =>
	'PhabricatorMailImplementationPHPMailerLiteAdapter',

	// When email is sent, what format should Phabricator use for user's
	// email addresses? Valid values are:
	// - 'short' - 'gwashington <gwashington@example.com>'
	// - 'real' - 'George Washington <gwashington@example.com>'
	// - 'full' - 'gwashington (George Washington) <gwashington@example.com>'
	// The default is 'full'.
	'metamta.user-address-format' => 'full',

	// If you're using PHPMailer to send email, provide the mailer and options
	// here. PHPMailer is much more enormous than PHPMailerLite, and provides more
	// mailers and greater enormity. You need it when you want to use SMTP
	// instead of sendmail as the mailer.
	'phpmailer.mailer' => 'smtp',
	'phpmailer.smtp-host' => '',
	'phpmailer.smtp-port' => 25,

	// When using PHPMailer with SMTP, you can set this to one of "tls" or "ssl"
	// to use TLS or SSL. Leave it blank for vanilla SMTP. If you're sending
	// via Gmail, set it to "ssl".
	'phpmailer.smtp-protocol' => '',

	// Set following if your smtp server requires authentication.
	'phpmailer.smtp-user' => null,
	'phpmailer.smtp-password' => null,

	// If you're using Amazon SES to send email, provide your AWS access key
	// and AWS secret key here. To set up Amazon SES with Phabricator, you need
	// to:
	// - Make sure 'metamta.mail-adapter' is set to:
	// "PhabricatorMailImplementationAmazonSESAdapter"
	// - Make sure 'metamta.can-send-as-user' is false.
	// - Make sure 'metamta.default-address' is configured to something sensible.
	// - Make sure 'metamta.default-address' is a validated SES "From" address.
	'amazon-ses.access-key' => null,
	'amazon-ses.secret-key' => null,

	// If you're using Sendgrid to send email, provide your access credentials
	// here. This will use the REST API. You can also use Sendgrid as a normal
	// SMTP service.
	'sendgrid.api-user' => null,
	'sendgrid.api-key' => null,

	// You can configure a reply handler domain so that email sent from Maniphest
	// will have a special "Reply To" address like "T123+82+af19f@example.com"
	// that allows recipients to reply by email and interact with tasks. For
	// instructions on configurating reply handlers, see the article
	// "Configuring Inbound Email" in the Phabricator documentation. By default,
	// this is set to 'null' and Phabricator will use a generic 'noreply@' address
	// or the address of the acting user instead of a special reply handler
	// address (see 'metamta.default-address'). If you set a domain here,
	// Phabricator will begin generating private reply handler addresses. See
	// also 'metamta.maniphest.reply-handler' to further configure behavior.
	// This key should be set to the domain part after the @, like "example.com".
	'metamta.maniphest.reply-handler-domain' => null,

	// You can follow the instructions in "Configuring Inbound Email" in the
	// Phabricator documentation and set 'metamta.maniphest.reply-handler-domain'
	// to support updating Maniphest tasks by email. If you want more advanced
	// customization than this provides, you can override the reply handler
	// class with an implementation of your own. This will allow you to do things
	// like have a single public reply handler or change how private reply
	// handlers are generated and validated.
	//
	// This key should be set to a loadable subclass of
	// PhabricatorMailReplyHandler.
	'metamta.maniphest.reply-handler' => 'ManiphestReplyHandler',

	// If you don't want phabricator to take up an entire domain
	// (or subdomain for that matter), you can use this and set a common
	// prefix for mail sent by phabricator. It will make use of the fact that
	// a mail-address such as phabricator+D123+1hjk213h@example.com will be
	// delivered to the phabricator users mailbox.
	// Set this to the left part of the email address and it well get
	// prepended to all outgoing mail. If you want to use e.g.
	// 'phabricator@example.com' this should be set to 'phabricator'.
	'metamta.single-reply-handler-prefix' => null,

	// Prefix prepended to mail sent by Maniphest. You can change this to
	// distinguish between testing and development installs, for example.
	'metamta.maniphest.subject-prefix' => '[Maniphest]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
	// affects Pholio.
	'metamta.pholio.reply-handler-domain' => null,

	// Prefix prepended to mail sent by Pholio.
	'metamta.pholio.subject-prefix' => '[Pholio]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
	// affects Macro.
	'metamta.macro.reply-handler-domain' => null,

	// Prefix prepended to mail sent by Macro.
	'metamta.macro.subject-prefix' => '[Macro]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
	// but allows email replies via Differential.
	'metamta.differential.reply-handler-domain' => null,

	// See 'metamta.maniphest.reply-handler'. This does the same thing, but
	// affects Differential.
	'metamta.differential.reply-handler' => 'DifferentialReplyHandler',

	// Prefix prepended to mail sent by Differential.
	'metamta.differential.subject-prefix' => '[Differential]',

	// Set this to true if you want patches to be attached to mail from
	// Differential. This won't work if you are using SendGrid as your mail
	// adapter.
	'metamta.differential.attach-patches' => false,

	// To include patches in email bodies, set this to a positive integer. Patches
	// will be inlined if they are at most that many lines. For instance, a value
	// of 100 means "inline patches if they are no longer than 100 lines". By
	// default, patches are not inlined.
	'metamta.differential.inline-patches' => 0,

	// If you enable either of the options above, you can choose what format
	// patches are sent in. Valid options are 'unified' (like diff -u) or 'git'.
	'metamta.differential.patch-format' => 'unified',

	// Enables a different format for comments in differential emails.
	// Differential will create unified diffs around the comment, which
	// will give enough context for people who are only viewing the
	// reviews in email to understand what is going on. The context will
	// be created based on the range of the comment.
	'metamta.differential.unified-comment-context' => false,

	// Prefix prepended to mail sent by Diffusion.
	'metamta.diffusion.subject-prefix' => '[Diffusion]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
	// but allows email replies via Diffusion.
	'metamta.diffusion.reply-handler-domain' => null,

	// See 'metamta.maniphest.reply-handler'. This does the same thing, but
	// affects Diffusion.
	'metamta.diffusion.reply-handler' => 'PhabricatorAuditReplyHandler',

	// Set this to true if you want patches to be attached to commit notifications
	// from Diffusion. This won't work with SendGrid.
	'metamta.diffusion.attach-patches' => false,

	// To include patches in Diffusion email bodies, set this to a positive
	// integer. Patches will be inlined if they are at most that many lines.
	// By default, patches are not inlined.
	'metamta.diffusion.inline-patches' => 0,

	// If you've enabled attached patches or inline patches for commit emails, you
	// can establish a hard byte limit on their size. You should generally set
	// reasonable byte and time limits (defaults are 1MB and 60 seconds) to avoid
	// sending ridiculously enormous email for changes like "importing an external
	// library" or "accidentally committed this full-length movie as text".
	'metamta.diffusion.byte-limit' => 1024 * 1024,

	// If you've enabled attached patches or inline patches for commit emails, you
	// can establish a hard time limit on generating them.
	'metamta.diffusion.time-limit' => 60,

	// Prefix prepended to mail sent by Package.
	'metamta.package.subject-prefix' => '[Package]',

	// See 'metamta.maniphest.reply-handler'. This does similar thing for package
	// except that it only supports sending out mail and doesn't handle incoming
	// email.
	'metamta.package.reply-handler' => 'OwnersPackageReplyHandler',

	// By default, Phabricator generates unique reply-to addresses and sends a
	// separate email to each recipient when you enable reply handling. This is
	// more secure than using "From" to establish user identity, but can mean
	// users may receive multiple emails when they are on mailing lists. Instead,
	// you can use a single, non-unique reply to address and authenticate users
	// based on the "From" address by setting this to 'true'. This trades away
	// a little bit of security for convenience, but it's reasonable in many
	// installs. Object interactions are still protected using hashes in the
	// single public email address, so objects can not be replied to blindly.
	'metamta.public-replies' => false,

	// You can configure an email address like "bugs@phabricator.example.com"
	// which will automatically create Maniphest tasks when users send email
	// to it. This relies on the "From" address to authenticate users, so it is
	// is not completely secure. To set this up, enter a complete email
	// address like "bugs@phabricator.example.com" and then configure mail to
	// that address so it routed to Phabricator (if you've already configured
	// reply handlers, you're probably already done). See "Configuring Inbound
	// Email" in the documentation for more information.
	'metamta.maniphest.public-create-email' => null,

	// If you enable 'metamta.public-replies', Phabricator uses "From" to
	// authenticate users. You can additionally enable this setting to try to
	// authenticate with 'Reply-To'. Note that this is completely spoofable and
	// insecure (any user can set any 'Reply-To' address) but depending on the
	// nature of your install or other deliverability conditions this might be
	// okay. Generally, you can't do much more by spoofing Reply-To than be
	// annoying (you can write but not read content). But, you know, this is
	// still COMPLETELY INSECURE.
	'metamta.insecure-auth-with-reply-to' => false,

	// If you enable 'metamta.maniphest.public-create-email' and create an
	// email address like "bugs@phabricator.example.com", it will default to
	// rejecting mail which doesn't come from a known user. However, you might
	// want to let anyone send email to this address; to do so, set a default
	// author here (a Phabricator username). A typical use of this might be to
	// create a "System Agent" user called "bugs" and use that name here. If you
	// specify a valid username, mail will always be accepted and used to create
	// a task, even if the sender is not a system user. The original email
	// address will be stored in an 'From Email' field on the task.
	'metamta.maniphest.default-public-author' => null,

	'metamta.herald.show-hints' => true,

	// You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer
	// smaller messages. The actions themselves will still work properly.
	'metamta.reply.show-hints' => true,

	// You can disable the "To:" and "Cc:" footers in mail if users prefer
	// smaller messages.
	'metamta.recipients.show-hints' => true,

	// If this option is enabled, Phabricator will add a "Precedence: bulk"
	// header to transactional mail (e.g., Differential, Maniphest and Herald
	// notifications). This may improve the behavior of some auto-responder
	// software and prevent it from replying. However, it may also cause
	// deliverability issues -- notably, you currently can not send this header
	// via Amazon SES, and enabling this option with SES will prevent delivery
	// of any affected mail.
	'metamta.precedence-bulk' => false,

	// Mail.app on OS X Lion won't respect threading headers unless the subject
	// is prefixed with "Re:". If you enable this option, Phabricator will add
	// "Re:" to the subject line of all mail which is expected to thread. If
	// you've set 'metamta.one-mail-per-recipient', users can override this
	// setting in their preferences.
	'metamta.re-prefix' => false,

	// If true, allow MetaMTA to change mail subjects to put text like
	// '[Accepted]' and '[Commented]' in them. This makes subjects more useful,
	// but might break threading on some clients. If you've set
	// 'metamta.one-mail-per-recipient', users can override this setting in their
	// preferences.
	'metamta.vary-subjects' => true,

	// -- Auth ------------------------------------------------------------------ //

	// If true, email addresses must be verified (by clicking a link in an
	// email) before a user can login. By default, verification is optional
	// unless 'auth.email-domains' is nonempty (see below).
	'auth.require-email-verification' => false,

	// You can restrict allowed email addresses to certain domains (like
	// "yourcompany.com") by setting a list of allowed domains here. Users will
	// only be allowed to register using email addresses at one of the domains,
	// and will only be able to add new email addresses for these domains. If
	// you configure this, it implies 'auth.require-email-verification'.
	//
	// To configure email domains, set a list of domains like this:
	//
	// array(
	// 'yourcompany.com',
	// 'yourcompany.co.uk',
	// )
	//
	// You should omit the "@" from domains. Note that the domain must match
	// exactly. If you allow "yourcompany.com", that permits "joe@yourcompany.com"
	// but rejects "joe@mail.yourcompany.com".
	'auth.email-domains' => array(),

	// You can provide an arbitrary block of HTML here, which will appear on the
	// login screen. Normally, you'd use this to provide login or registration
	// instructions to users.
	'auth.login-message' => null,


	// -- Accounts -------------------------------------------------------------- //

	// Is basic account information (email, real name, profile picture) editable?
	// If you set up Phabricator to automatically synchronize account information
	// from some other authoritative system, you can disable this to ensure
	// information remains consistent across both systems.
	'account.editable' => true,

	// When users set or reset a password, it must have at least this many
	// characters.
	'account.minimum-password-length' => 8,


	// -- Recaptcha ------------------------------------------------------------- //

	// Is Recaptcha enabled? If disabled, captchas will not appear. You should
	// enable Recaptcha if your install is public-facing, as it hinders
	// brute-force attacks.
	'recaptcha.enabled' => false,

	// Your Recaptcha public key, obtained from Recaptcha.
	'recaptcha.public-key' => null,

	// Your Recaptcha private key, obtained from Recaptcha.
	'recaptcha.private-key' => null,


	// -- Misc ------------------------------------------------------------------ //

	// This is hashed with other inputs to generate CSRF tokens. If you want, you
	// can change it to some other string which is unique to your install. This
	// will make your install more secure in a vague, mostly theoretical way. But
	// it will take you like 3 seconds of mashing on your keyboard to set it up so
	// you might as well.
	'phabricator.csrf-key' => '0b7ec0592e0a2829d8b71df2fa269b2c6172eca3',

	// This is hashed with other inputs to generate mail tokens. If you want, you
	// can change it to some other string which is unique to your install. In
	// particular, you will want to do this if you accidentally send a bunch of
	// mail somewhere you shouldn't have, to invalidate all old reply-to
	// addresses.
	'phabricator.mail-key' => '5ce3e7e8787f6e40dfae861da315a5cdf1018f12',


	// PHP requires that you set a timezone in your php.ini before using date
	// functions, or it will emit a warning. If this isn't possible (for instance,
	// because you are using HPHP) you can set some valid constant for
	// date_default_timezone_set() here and Phabricator will set it on your
	// behalf, silencing the warning.
	'phabricator.timezone' => null,

	// Show stack traces when unhandled exceptions occur, force reloading of
	// static resources (skipping the cache), show an error callout if a page
	// generated PHP errors, warnings, or notices, force disk reads when
	// reloading, and generally make development easier. This option should not
	// be enabled in production.
	'phabricator.developer-mode' => false,

	// Should Phabricator show beta applications on the homepage
	'phabricator.show-beta-applications' => false,

	// Contains a list of uninstalled applications
	'phabricator.uninstalled-applications' => array(),

	// Allowing non-members to interact with tasks over email.
	'phabricator.allow-email-users' => false,

	// -- Welcome Screen -------------------------------------------------------- //

	// The custom HTML content for the Phabricator welcome screen.
	'welcome.html' => null,

	// -- Files ----------------------------------------------------------------- //

	// Lists which uploaded file types may be viewed in the browser. If a file
	// has a mime type which does not appear in this list, it will always be
	// downloaded instead of displayed. This is mainly a usability
	// consideration, since browsers tend to freak out when viewing enormous
	// binary files.
	//
	// The keys in this array are viewable mime types; the values are the mime
	// types they will be delivered as when they are viewed in the browser.
	//
	// IMPORTANT: Configure 'security.alternate-file-domain' above! Your install
	// is NOT safe if it is left unconfigured.
	'files.viewable-mime-types' => array(
	'image/jpeg' => 'image/jpeg',
	'image/jpg' => 'image/jpg',
	'image/png' => 'image/png',
	'image/gif' => 'image/gif',
	'text/plain' => 'text/plain; charset=utf-8',
	'text/x-diff' => 'text/plain; charset=utf-8',

	// ".ico" favicon files, which have mime type diversity. See:
	// http://en.wikipedia.org/wiki/ICO_(file_format)#MIME_type
	'image/x-ico' => 'image/x-icon',
	'image/x-icon' => 'image/x-icon',
	'image/vnd.microsoft.icon' => 'image/x-icon',
	),

	// List of mime types which can be used as the source for an <img /> tag.
	// This should be a subset of 'files.viewable-mime-types' and exclude files
	// like text.
	'files.image-mime-types' => array(
	'image/jpeg' => true,
	'image/jpg' => true,
	'image/png' => true,
	'image/gif' => true,
	'image/x-ico' => true,
	'image/x-icon' => true,
	'image/vnd.microsoft.icon' => true,
	),

	// Configuration option for enabling imagemagick
	// to resize animated profile pictures (gif)
	'files.enable-imagemagick' => false,

	// -- Storage --------------------------------------------------------------- //

	// Phabricator allows users to upload files, and can keep them in various
	// storage engines. This section allows you to configure which engines
	// Phabricator will use, and how it will use them.

	// The largest filesize Phabricator will store in the MySQL BLOB storage
	// engine, which just uses a database table to store files. While this isn't a
	// best practice, it's really easy to set up. Set this to 0 to disable use of
	// the MySQL blob engine.
	'storage.mysql-engine.max-size' => 1000000,

	// Phabricator provides a local disk storage engine, which just writes files
	// to some directory on local disk. The webserver must have read/write
	// permissions on this directory. This is straightforward and suitable for
	// most installs, but will not scale past one web frontend unless the path
	// is actually an NFS mount, since you'll end up with some of the files
	// written to each web frontend and no way for them to share. To use the
	// local disk storage engine, specify the path to a directory here. To
	// disable it, specify null.
	'storage.local-disk.path' => null,

	// If you want to store files in Amazon S3, specify an AWS access and secret
	// key here and a bucket name below.
	'amazon-s3.access-key' => null,
	'amazon-s3.secret-key' => null,

	// To use a custom endpoint, specify it here. Normally, you do not need to
	// configure this.
	'amazon-s3.endpoint' => null,

	// Set this to a valid Amazon S3 bucket to store files there. You must also
	// configure S3 access keys above.
	'storage.s3.bucket' => null,

	// Phabricator uses a storage engine selector to choose which storage engine
	// to use when writing file data. If you add new storage engines or want to
	// provide very custom rules (e.g., write images to one storage engine and
	// other files to a different one), you can provide an alternate
	// implementation here. The default engine will use choose MySQL, Local Disk,
	// and S3, in that order, if they have valid configurations above and a file
	// fits within configured limits.
	'storage.engine-selector' => 'PhabricatorDefaultFileStorageEngineSelector',

	// Set the size of the largest file a user may upload. This is used to render
	// text like "Maximum file size: 10MB" on interfaces where users can upload
	// files, and files larger than this size will be rejected.
	//
	// Specify this limit in bytes, or using a "K", "M", or "G" suffix.
	//
	// NOTE: Setting this to a large size is NOT sufficient to allow users to
	// upload large files. You must also configure a number of other settings. To
	// configure file upload limits, consult the article "Configuring File Upload
	// Limits" in the documentation. Once you've configured some limit across all
	// levels of the server, you can set this limit to an appropriate value and
	// the UI will then reflect the actual configured limit.
	'storage.upload-size-limit' => null,

	// Phabricator puts databases in a namespace, which defualts to "phabricator"
	// -- for instance, the Differential database is named
	// "phabricator_differential" by default. You can change this namespace if you
	// want. Normally, you should not do this unless you are developing
	// Phabricator and using namespaces to separate multiple sandbox datasets.
	'storage.default-namespace' => 'phabricator',


	// -- Search ---------------------------------------------------------------- //

	// Phabricator supports Elastic Search; to use it, specify a host like
	// 'http://elastic.example.com:9200/' here.
	'search.elastic.host' => null,

	// Phabricator uses a search engine selector to choose which search engine
	// to use when indexing and reconstructing documents, and when executing
	// queries. You can override the engine selector to provide a new selector
	// class which can select some custom engine you implement, if you want to
	// store your documents in some search engine which does not have default
	// support.
	'search.engine-selector' => 'PhabricatorDefaultSearchEngineSelector',


	// -- Differential ---------------------------------------------------------- //

	// List of file regexps where whitespace is meaningful and should not
	// use 'ignore-all' by default
	'differential.whitespace-matters' => array(
	'/\.py$/',
	'/\.l?hs$/',
	),

	// Differential has a required "Test Plan" field by default. You can make it
	// optional by setting this to false. You can also completely remove it above,
	// if you prefer.
	'differential.require-test-plan-field' => true,

	// If you set this to true, users can "!accept" revisions via email (normally,
	// they can take other actions but can not "!accept"). This action is disabled
	// by default because email authentication can be configured to be very weak,
	// and, socially, email "!accept" is kind of sketchy and implies revisions may
	// not actually be receiving thorough review.
	'differential.enable-email-accept' => false,

	// List of file regexps that should be treated as if they are generated by
	// an automatic process, and thus get hidden by default in differential.
	'differential.generated-paths' => array(
	// '/config\.h$/',
	// '#/autobuilt/#',
	),

	// If you set this to true, users can accept their own revisions. This action
	// is disabled by default because it's most likely not a behavior you want,
	// but it proves useful if you are working alone on a project and want to make
	// use of all of differential's features.
	'differential.allow-self-accept' => false,

	// If you set this to true, any user can close any revision so long as it has
	// been accepted. This can be useful depending on your development model. For
	// example, github-style pull requests where the reviewer is often the
	// actual committer can benefit from turning this option to true. If false,
	// only the submitter can close a revision.
	'differential.always-allow-close' => false,

	+ // If you set this to true, any user can abandon any revision. If false, only
	+ // the submitter can abandon a revision.
	+ 'differential.always-allow-abandon' => false,
	+
	// If you set this to true, any user can reopen a revision so long as it has
	// been closed. This can be useful if a revision is accidentally closed or
	// if a developer changes his or her mind after closing a revision. If it is
	// false, reopening is not allowed.
	'differential.allow-reopen' => false,

	// Revisions newer than this number of days are marked as fresh in Action
	// Required and Revisions Waiting on You views. Only work days (not weekends
	// and holidays) are included. Set to 0 to disable this feature.
	'differential.days-fresh' => 1,

	// Similar to 'differential.days-fresh' but marks stale revisions. If the
	// revision is even older than it is marked as old.
	'differential.days-stale' => 3,

	// -- Repositories ---------------------------------------------------------- //

	// The default location in which to store local copies of repositories.
	// Anything stored in this directory will be assumed to be under the
	// control of phabricator, which means that Phabricator will try to do some
	// maintenance on working copies if there are problems (such as a change
	// to the remote origin url). This maintenance may include completely
	// removing (and recloning) anything in this directory.
	//
	// When set to null, this option is ignored (i.e. Phabricator will not fully
	// control any working copies).
	'repository.default-local-path' => null,

	// -- Maniphest ------------------------------------------------------------- //

	// What should the default task priority be in create flows?
	// See the constants in @{class:ManiphestTaskPriority} for valid values.
	// Defaults to "needs triage".
	'maniphest.default-priority' => 90,

	// -- Phame ----------------------------------------------------------------- //

	// Should Phame users have Disqus comment widget, and if so what's the
	// website shortname to use? For example, secure.phabricator.org uses
	// "phabricator", which we registered with Disqus. If you aren't familiar
	// with Disqus, see:
	// Disqus quick start guide - http://docs.disqus.com/help/4/
	// Information on shortnames - http://docs.disqus.com/help/68/
	'disqus.shortname' => null,

	// Directories to look for Phame skins inside of.
	'phame.skins' => array(
	'externals/skins/',
	),

	// -- Remarkup -------------------------------------------------------------- //

	// If you enable this, linked YouTube videos will be embeded inline. This has
	// mild security implications (you'll leak referrers to YouTube) and is pretty
	// silly (but sort of awesome).
	'remarkup.enable-embedded-youtube' => false,


	// -- Cache ----------------------------------------------------------------- //

	// Set this to false to disable the use of gzdeflate()-based compression in
	// some caches. This may give you less performant (but more debuggable)
	// caching.
	'cache.enable-deflate' => true,

	// -- Garbage Collection ---------------------------------------------------- //

	// Phabricator generates various logs and caches in the database which can
	// be garbage collected after a while to make the total data size more
	// manageable. To run garbage collection, launch a
	// PhabricatorGarbageCollector daemon.

	// These 'ttl' keys configure how much old data the GC daemon keeps around.
	// Objects older than the ttl will be collected. Set any value to 0 to store
	// data indefinitely.

	'gcdaemon.ttl.herald-transcripts' => 30 * (24 * 60 * 60),
	'gcdaemon.ttl.daemon-logs' => 7 * (24 * 60 * 60),
	'gcdaemon.ttl.differential-parse-cache' => 14 * (24 * 60 * 60),
	'gcdaemon.ttl.markup-cache' => 30 * (24 * 60 * 60),
	'gcdaemon.ttl.task-archive' => 14 * (24 * 60 * 60),
	'gcdaemon.ttl.general-cache' => 30 * (24 * 60 * 60),


	// -- Feed ------------------------------------------------------------------ //

	// If you set this to true, you can embed Phabricator activity feeds in other
	// pages using iframes. These feeds are completely public, and a login is not
	// required to view them! This is intended for things like open source
	// projects that want to expose an activity feed on the project homepage.
	//
	// NOTE: You must also set `policy.allow-public` to true for this setting
	// to work properly.
	'feed.public' => false,

	// If you set this to a list of http URIs, when a feed story is published a
	// task will be created for each uri that posts the story data to the uri.
	// Daemons automagically retry failures 100 times, waiting $fail_count * 60s
	// between each subsequent failure. Be sure to keep the daemon console
	// (/daemon/) open while developing and testing your end points. You may need
	// to restart your daemons to start sending http requests.
	//
	// NOTE: URIs are not validated, the URI must return http status 200 within
	// 30 seconds, and no permission checks are performed.
	'feed.http-hooks' => array(),

	// -- Drydock --------------------------------------------------------------- //

	// If you want to use Drydock's builtin EC2 Blueprints, configure your AWS
	// EC2 credentials here.
	'amazon-ec2.access-key' => null,
	'amazon-ec2.secret-key' => null,


	// -- Customization --------------------------------------------------------- //

	// Paths to additional phutil libraries to load.
	'load-libraries' => array(),

	'aphront.default-application-configuration-class' =>
	'AphrontDefaultApplicationConfiguration',

	// Directory that phd (the Phabricator daemon control script) should use to
	// track running daemons.
	'phd.pid-directory' => '/var/tmp/phd/pid',

	// Directory that the Phabricator daemons should use to store the log file
	'phd.log-directory' => '/var/tmp/phd/log',

	// Number of "TaskMaster" daemons that "phd start" should start. You can
	// raise this if you have a task backlog, or explicitly launch more with
	// "phd launch <N> taskmaster".
	'phd.start-taskmasters' => 4,

	// Launch daemons in "verbose" mode by default. This creates a lot of output,
	// but can help debug issues. Daemons launched in debug mode with "phd debug"
	// are always launched in verbose mode. See also 'phd.trace'.
	'phd.verbose' => false,

	// Launch daemons in "trace" mode by default. This creates an ENORMOUS amount
	// of output, but can help debug issues. Daemons launched in debug mode with
	// "phd debug" are always launched in trace mdoe. See also 'phd.verbose'.
	'phd.trace' => false,

	// This value is an input to the hash function when building resource hashes.
	// It has no security value, but if you accidentally poison user caches (by
	// pushing a bad patch or having something go wrong with a CDN, e.g.) you can
	// change this to something else and rebuild the Celerity map to break user
	// caches. Unless you are doing Celerity development, it is exceptionally
	// unlikely that you need to modify this.
	'celerity.resource-hash' => 'd9455ea150622ee044f7931dabfa52aa',

	// Minify static resources by removing whitespace and comments. You should
	// enable this in production, but disable it in development.
	'celerity.minify' => true,

	// You can respond to various application events by installing listeners,
	// which will receive callbacks when interesting things occur. Specify a list
	// of classes which extend PhabricatorEventListener here.
	'events.listeners' => array(),

	// -- Syntax Highlighting --------------------------------------------------- //

	// Phabricator can highlight PHP by default and use Pygments for other
	// languages if enabled. You can provide a custom highlighter engine by
	// extending class PhutilSyntaxHighlighterEngine.
	'syntax-highlighter.engine' => 'PhutilDefaultSyntaxHighlighterEngine',

	// If you want syntax highlighting for other languages than PHP then you can
	// install the python package 'Pygments', make sure the 'pygmentize' script is
	// available in the $PATH of the webserver, and then enable this.
	'pygments.enabled' => false,

	// In places that we display a dropdown to syntax-highlight code,
	// this is where that list is defined.
	// Syntax is 'lexer-name' => 'Display Name',
	'pygments.dropdown-choices' => array(
	'apacheconf' => 'Apache Configuration',
	'bash' => 'Bash Scripting',
	'brainfuck' => 'Brainf*ck',
	'c' => 'C',
	'coffee-script' => 'CoffeeScript',
	'cpp' => 'C++',
	'css' => 'CSS',
	'd' => 'D',
	'diff' => 'Diff',
	'django' => 'Django Templating',
	'erb' => 'Embedded Ruby/ERB',
	'erlang' => 'Erlang',
	'go' => 'Golang',
	'groovy' => 'Groovy',
	'haskell' => 'Haskell',
	'html' => 'HTML',
	'java' => 'Java',
	'js' => 'Javascript',
	'json' => 'JSON',
	'mysql' => 'MySQL',
	'objc' => 'Objective-C',
	'perl' => 'Perl',
	'php' => 'PHP',
	'puppet' => 'Puppet',
	'rest' => 'reStructuredText',
	'text' => 'Plain Text',
	'python' => 'Python',
	'rainbow' => 'Rainbow',
	'remarkup' => 'Remarkup',
	'ruby' => 'Ruby',
	'xml' => 'XML',
	'yaml' => 'YAML',
	),

	// This is an override list of regular expressions which allows you to choose
	// what language files are highlighted as. If your projects have certain rules
	// about filenames or use unusual or ambiguous language extensions, you can
	// create a mapping here. This is an ordered dictionary of regular expressions
	// which will be tested against the filename. They should map to either an
	// explicit language as a string value, or a numeric index into the captured
	// groups as an integer.
	'syntax.filemap' => array(
	// Example: Treat all '*.xyz' files as PHP.
	// '@\\.xyz$@' => 'php',

	// Example: Treat 'httpd.conf' as 'apacheconf'.
	// '@/httpd\\.conf$@' => 'apacheconf',

	// Example: Treat all '*.x.bak' file as '.x'. NOTE: we map to capturing
	// group 1 by specifying the mapping as "1".
	// '@\\.([^.]+)\\.bak$@' => 1,

	'@\.arcconfig$@' => 'js',
	'@\.arclint$@' => 'js',
	'@\.divinerconfig$@' => 'js',
	),

	// Set the default monospaced font style for users who haven't set a custom
	// style.
	'style.monospace' => '10px "Menlo", "Consolas", "Monaco", monospace',
	'style.monospace.windows' => '11px "Menlo", "Consolas", "Monaco", monospace',


	// -- Debugging ------------------------------------------------------------- //

	// Enable this to change HTTP redirects into normal pages with a link to the
	// redirection target. For example, after you submit a form you'll get a page
	// saying "normally, you'd be redirected...". This is useful to examine
	// service or profiler information on write pathways, or debug redirects. It
	// also makes the UX horrible for normal use, so you should enable it only
	// when debugging.
	//
	// NOTE: This does not currently work for forms with Javascript "workflow",
	// since the redirect happens in Javascript.
	'debug.stop-on-redirect' => false,

	// Set the rate for how often to do sampled profiling. On average, one
	// request for every number of requests specified here will be sampled.
	// Set this value to 0 to completely disable profiling. In a production
	// environment, this value should either be set to 0 (to disable) or to
	// a large number (to sample only a few requests).
	'debug.profile-rate' => 0,

	// -- Environment ---------------------------------------------------------- //

	// Phabricator occasionally shells out to other binaries on the server.
	// An example of this is the "pygmentize" command, used to syntax-highlight
	// code written in languages other than PHP. By default, it is assumed that
	// these binaries are in the $PATH of the user running Phabricator (normally
	// 'apache', 'httpd', or 'nobody'). Here you can add extra directories to
	// the $PATH environment variable, for when these binaries are in non-standard
	// locations.
	'environment.append-paths' => array(),

	// -- Audit ---------------------------------------------------------- //

	// Controls whether or not task creator can Close Audits
	'audit.can-author-close-audit' => false,
	);
	diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	index a0c0f4e914..61832ae125 100644
	--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	@@ -1,288 +1,299 @@
	<?php

	final class PhabricatorDifferentialConfigOptions
	extends PhabricatorApplicationConfigOptions {

	public function getName() {
	return pht('Differential');
	}

	public function getDescription() {
	return pht('Configure Differential code review.');
	}

	public function getOptions() {
	$custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';

	$fields = array(
	new DifferentialTitleField(),
	new DifferentialSummaryField(),
	new DifferentialTestPlanField(),
	new DifferentialAuthorField(),
	new DifferentialReviewersField(),
	new DifferentialProjectReviewersField(),
	new DifferentialReviewedByField(),
	new DifferentialSubscribersField(),
	new DifferentialRepositoryField(),
	new DifferentialLintField(),
	new DifferentialUnitField(),
	new DifferentialViewPolicyField(),
	new DifferentialEditPolicyField(),

	new DifferentialDependsOnField(),
	new DifferentialDependenciesField(),
	new DifferentialManiphestTasksField(),
	new DifferentialCommitsField(),

	new DifferentialJIRAIssuesField(),
	new DifferentialAsanaRepresentationField(),

	new DifferentialChangesSinceLastUpdateField(),
	new DifferentialBranchField(),

	new DifferentialBlameRevisionField(),
	new DifferentialPathField(),
	new DifferentialHostField(),
	new DifferentialRevertPlanField(),

	new DifferentialApplyPatchField(),

	new DifferentialRevisionIDField(),
	);

	$default_fields = array();
	foreach ($fields as $field) {
	$default_fields[$field->getFieldKey()] = array(
	'disabled' => $field->shouldDisableByDefault(),
	);
	}

	return array(
	$this->newOption(
	'differential.fields',
	$custom_field_type,
	$default_fields)
	->setCustomData(
	id(new DifferentialRevision())->getCustomFieldBaseClass())
	->setDescription(
	pht(
	"Select and reorder revision fields.\n\n".
	"NOTE: This feature is under active development and subject ".
	"to change.")),
	$this->newOption(
	'differential.whitespace-matters',
	'list<regex>',
	array(
	'/\.py$/',
	'/\.l?hs$/',
	))
	->setDescription(
	pht(
	"List of file regexps where whitespace is meaningful and should ".
	"not use 'ignore-all' by default")),
	$this->newOption('differential.require-test-plan-field', 'bool', true)
	->setBoolOptions(
	array(
	pht("Require 'Test Plan' field"),
	pht("Make 'Test Plan' field optional"),
	))
	->setSummary(pht('Require "Test Plan" field?'))
	->setDescription(
	pht(
	"Differential has a required 'Test Plan' field by default. You ".
	"can make it optional by setting this to false. You can also ".
	"completely remove it above, if you prefer.")),
	$this->newOption('differential.enable-email-accept', 'bool', false)
	->setBoolOptions(
	array(
	pht('Enable Email "!accept" Action'),
	pht('Disable Email "!accept" Action'),
	))
	->setSummary(pht('Enable or disable "!accept" action via email.'))
	->setDescription(
	pht(
	'If inbound email is configured, users can interact with '.
	'revisions by using "!actions" in email replies (for example, '.
	'"!resign" or "!rethink"). However, by default, users may not '.
	'"!accept" revisions via email: email authentication can be '.
	'configured to be very weak, and email "!accept" is kind of '.
	'sketchy and implies the revision may not actually be receiving '.
	'thorough review. You can enable "!accept" by setting this '.
	'option to true.')),
	$this->newOption('differential.generated-paths', 'list<regex>', array())
	->setSummary(pht("File regexps to treat as automatically generated."))
	->setDescription(
	pht(
	"List of file regexps that should be treated as if they are ".
	"generated by an automatic process, and thus get hidden by ".
	"default in differential."))
	->addExample("/config\.h$/\n#/autobuilt/#", pht("Valid Setting")),
	$this->newOption('differential.sticky-accept', 'bool', true)
	->setBoolOptions(
	array(
	pht("Accepts persist across updates"),
	pht("Accepts are reset by updates"),
	))
	->setSummary(
	pht('Should "Accepted" revisions remain "Accepted" after updates?'))
	->setDescription(
	pht(
	'Normally, when revisions that have been "Accepted" are updated, '.
	'they remain "Accepted". This allows reviewers to suggest minor '.
	'alterations when accepting, and encourages authors to update '.
	'if they make minor changes in response to this feedback.'.
	"\n\n".
	'If you want updates to always require re-review, you can disable '.
	'the "stickiness" of the "Accepted" status with this option. '.
	'This may make the process for minor changes much more burdensome '.
	'to both authors and reviewers.')),
	$this->newOption('differential.allow-self-accept', 'bool', false)
	->setBoolOptions(
	array(
	pht("Allow self-accept"),
	pht("Disallow self-accept"),
	))
	->setSummary(pht("Allows users to accept their own revisions."))
	->setDescription(
	pht(
	"If you set this to true, users can accept their own revisions. ".
	"This action is disabled by default because it's most likely not ".
	"a behavior you want, but it proves useful if you are working ".
	"alone on a project and want to make use of all of ".
	"differential's features.")),
	$this->newOption('differential.always-allow-close', 'bool', false)
	->setBoolOptions(
	array(
	pht("Allow any user"),
	pht("Restrict to submitter"),
	))
	->setSummary(pht("Allows any user to close accepted revisions."))
	->setDescription(
	pht(
	"If you set this to true, any user can close any revision so ".
	"long as it has been accepted. This can be useful depending on ".
	"your development model. For example, github-style pull requests ".
	"where the reviewer is often the actual committer can benefit ".
	"from turning this option to true. If false, only the submitter ".
	"can close a revision.")),
	+ $this->newOption('differential.always-allow-abandon', 'bool', false)
	+ ->setBoolOptions(
	+ array(
	+ pht('Allow any user'),
	+ pht('Restrict to submitter'),
	+ ))
	+ ->setSummary(pht('Allows any user to abandon revisions.'))
	+ ->setDescription(
	+ pht(
	+ 'If you set this to true, any user can abandon any revision. If '.
	+ 'false, only the submitter can abandon a revision.')),
	$this->newOption('differential.allow-reopen', 'bool', false)
	->setBoolOptions(
	array(
	pht("Enable reopen"),
	pht("Disable reopen"),
	))
	->setSummary(pht("Allows any user to reopen a closed revision."))
	->setDescription(
	pht("If you set this to true, any user can reopen a revision so ".
	"long as it has been closed. This can be useful if a revision ".
	"is accidentally closed or if a developer changes his or her ".
	"mind after closing a revision. If it is false, reopening ".
	"is not allowed.")),
	$this->newOption('differential.close-on-accept', 'bool', false)
	->setBoolOptions(
	array(
	pht('Treat Accepted Revisions as "Closed"'),
	pht('Treat Accepted Revisions as "Open"'),
	))
	->setSummary(pht('Allows "Accepted" to act as a closed status.'))
	->setDescription(
	pht(
	'Normally, Differential revisions remain on the dashboard when '.
	'they are "Accepted", and the author then commits the changes '.
	'to "Close" the revision and move it off the dashboard.'.
	"\n\n".
	'If you have an unusual workflow where Differential is used for '.
	'post-commit review (normally called "Audit", elsewhere in '.
	'Phabricator), you can set this flag to treat the "Accepted" '.
	'state as a "Closed" state and end the review workflow early.'.
	"\n\n".
	'This sort of workflow is very unusual. Very few installs should '.
	'need to change this option.')),
	$this->newOption('differential.days-fresh', 'int', 1)
	->setSummary(
	pht(
	"For how many business days should a revision be considered ".
	"'fresh'?"))
	->setDescription(
	pht(
	"Revisions newer than this number of days are marked as fresh in ".
	"Action Required and Revisions Waiting on You views. Only work ".
	"days (not weekends and holidays) are included. Set to 0 to ".
	"disable this feature.")),
	$this->newOption('differential.days-stale', 'int', 3)
	->setSummary(
	pht("After this many days, a revision will be considered 'stale'."))
	->setDescription(
	pht(
	"Similar to `differential.days-fresh` but marks stale revisions. ".
	"If the revision is even older than it is when marked as 'old'.")),
	$this->newOption(
	'metamta.differential.reply-handler-domain',
	'string',
	null)
	->setDescription(
	pht('Inbound email domain for Differential replies.')),
	$this->newOption(
	'metamta.differential.reply-handler',
	'class',
	'DifferentialReplyHandler')
	->setBaseClass('PhabricatorMailReplyHandler')
	->setDescription(pht('Alternate reply handler class.')),
	$this->newOption(
	'metamta.differential.subject-prefix',
	'string',
	'[Differential]')
	->setDescription(pht('Subject prefix for Differential mail.')),
	$this->newOption(
	'metamta.differential.attach-patches',
	'bool',
	false)
	->setBoolOptions(
	array(
	pht("Attach Patches"),
	pht("Do Not Attach Patches"),
	))
	->setSummary(pht("Attach patches to email, as text attachments."))
	->setDescription(
	pht(
	"If you set this to true, Phabricator will attach patches to ".
	"Differential mail (as text attachments). This will not work if ".
	"you are using SendGrid as your mail adapter.")),
	$this->newOption(
	'metamta.differential.inline-patches',
	'int',
	0)
	->setSummary(pht("Inline patches in email, as body text."))
	->setDescription(
	pht(
	"To include patches inline in email bodies, set this to a ".
	"positive integer. Patches will be inlined if they are at most ".
	"that many lines. For instance, a value of 100 means 'inline ".
	"patches if they are no longer than 100 lines'. By default, ".
	"patches are not inlined.")),
	// TODO: Implement 'enum'? Options are 'unified' or 'git'.
	$this->newOption(
	'metamta.differential.patch-format',
	'string',
	'unified')
	->setDescription(
	pht("Format for inlined or attached patches: 'git' or 'unified'.")),
	$this->newOption(
	'metamta.differential.unified-comment-context',
	'bool',
	false)
	->setBoolOptions(
	array(
	pht("Show context"),
	pht("Do not show context"),
	))
	->setSummary(pht("Show diff context around inline comments in email."))
	->setDescription(
	pht(
	"Normally, inline comments in emails are shown with a file and ".
	"line but without any diff context. Enabling this option adds ".
	"diff context.")),
	);
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
	index c45b4197ac..f92014aeab 100644
	--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
	@@ -1,961 +1,966 @@
	<?php

	final class DifferentialRevisionViewController extends DifferentialController {

	private $revisionID;

	public function shouldAllowPublic() {
	return true;
	}

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

	public function processRequest() {

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

	$revision = id(new DifferentialRevisionQuery())
	->withIDs(array($this->revisionID))
	->setViewer($request->getUser())
	->needRelationships(true)
	->needReviewerStatus(true)
	->needReviewerAuthority(true)
	->executeOne();

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

	$diffs = id(new DifferentialDiffQuery())
	->setViewer($request->getUser())
	->withRevisionIDs(array($this->revisionID))
	->needArcanistProjects(true)
	->execute();
	$diffs = array_reverse($diffs, $preserve_keys = true);

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

	$revision->attachActiveDiff(last($diffs));

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

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

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

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

	$repository = null;
	$repository_phid = $target->getRepositoryPHID();
	if ($repository_phid) {
	if ($repository_phid == $revision->getRepositoryPHID()) {
	$repository = $revision->getRepository();
	} else {
	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($user)
	->withPHIDs(array($repository_phid))
	->executeOne();
	}
	}

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

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

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

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

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

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

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

	$request_uri = $request->getRequestURI();

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

	$my_inlines = id(new DifferentialInlineCommentQuery())
	->withDraftComments($user->getPHID(), $this->revisionID)
	->execute();

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

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

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

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

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


	// TODO: This should be in a DiffQuery or similar.
	$need_props = array();
	foreach ($field_list->getFields() as $field) {
	foreach ($field->getRequiredDiffPropertiesForRevisionView() as $prop) {
	$need_props[$prop] = $prop;
	}
	}

	if ($need_props) {
	$prop_diff = $revision->getActiveDiff();
	$load_props = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d AND name IN (%Ls)',
	$prop_diff->getID(),
	$need_props);
	$load_props = mpull($load_props, 'getData', 'getName');
	foreach ($need_props as $need) {
	$prop_diff->attachProperty($need, idx($load_props, $need));
	}
	}

	$commit_hashes = mpull($diffs, 'getSourceControlBaseRevision');
	$local_commits = idx($props, 'local:commits', array());
	foreach ($local_commits as $local_commit) {
	$commit_hashes[] = idx($local_commit, 'tree');
	$commit_hashes[] = idx($local_commit, 'local');
	}
	$commit_hashes = array_unique(array_filter($commit_hashes));
	if ($commit_hashes) {
	$commits_for_links = id(new DiffusionCommitQuery())
	->setViewer($user)
	->withIdentifiers($commit_hashes)
	->execute();
	$commits_for_links = mpull(
	$commits_for_links,
	null,
	'getCommitIdentifier');
	} else {
	$commits_for_links = array();
	}

	$revision_detail = id(new DifferentialRevisionDetailView())
	->setUser($user)
	->setRevision($revision)
	->setDiff(end($diffs))
	->setCustomFields($field_list)
	->setURI($request->getRequestURI());

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

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

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

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

	$revision_detail_box = $revision_detail->render();

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

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

	if (!$viewer_is_anonymous) {
	$comment_view->setQuoteRef('D'.$revision->getID());
	$comment_view->setQuoteTargetID('comment-content');
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

	$comment_form = new DifferentialAddCommentView();
	$comment_form->setRevision($revision);

	$review_warnings = array();
	foreach ($field_list->getFields() as $field) {
	$review_warnings[] = $field->getWarningsForDetailView();
	}
	$review_warnings = array_mergev($review_warnings);

	if ($review_warnings) {
	$review_warnings_panel = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_WARNING)
	->setErrors($review_warnings);
	$comment_form->setErrorView($review_warnings_panel);
	}

	$comment_form->setActions($this->getRevisionCommentActions($revision));
	$action_uri = $this->getApplicationURI(
	'comment/save/'.$revision->getID().'/');

	$comment_form->setActionURI($action_uri);
	$comment_form->setUser($user);
	$comment_form->setDraft($draft);
	$comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
	$comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));

	// TODO: This just makes the "Z" key work. Generalize this and remove
	// it at some point.
	$comment_form = phutil_tag(
	'div',
	array(
	'class' => 'differential-add-comment-panel',
	),
	$comment_form);
	}

	$pane_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	'haunt' => $pane_id,
	));
	Javelin::initBehavior('differential-user-select');

	$page_pane = id(new DifferentialPrimaryPaneView())
	->setID($pane_id)
	->appendChild(array(
	$comment_view,
	$diff_history,
	$warning,
	$local_view,
	$toc_view,
	$other_view,
	$changeset_view,
	));
	if ($comment_form) {

	$page_pane->appendChild($comment_form);
	} else {
	// TODO: For now, just use this to get "Login to Comment".
	$page_pane->appendChild(
	id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setRequestURI($request->getRequestURI()));
	}


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

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

	$content = array(
	$top_anchor,
	$revision_detail_box,
	$page_pane,
	);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($object_id, '/'.$object_id);
	$crumbs->setActionList($revision_detail->getActionList());

	$prefs = $user->loadPreferences();

	$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
	if ($prefs->getPreference($pref_filetree)) {
	$collapsed = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED,
	false);

	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setAnchorName('top')
	->setTitle('D'.$revision->getID())
	->setBaseURI(new PhutilURI('/D'.$revision->getID()))
	->setCollapsed((bool)$collapsed)
	->build($changesets);
	$nav->appendChild($content);
	$nav->setCrumbs($crumbs);
	$content = $nav;
	} else {
	array_unshift($content, $crumbs);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $object_id.' '.$revision->getTitle(),
	'pageObjects' => array($revision->getPHID()),
	'device' => true,
	));
	}

	private function getRevisionActions(DifferentialRevision $revision) {
	$viewer = $this->getRequest()->getUser();
	$revision_id = $revision->getID();
	$revision_phid = $revision->getPHID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$revision,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions = array();

	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref("/differential/revision/edit/{$revision_id}/")
	->setName(pht('Edit Revision'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);

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

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

	$maniphest = 'PhabricatorApplicationManiphest';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-anchor')
	->setName(pht('Edit Maniphest Tasks'))
	->setHref("/search/attach/{$revision_phid}/TASK/")
	->setWorkflow(true)
	->setDisabled(!$can_edit);
	}

	$request_uri = $this->getRequest()->getRequestURI();
	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-download')
	->setName(pht('Download Raw Diff'))
	->setHref($request_uri->alter('download', 'true'));

	return $actions;
	}

	private function getRevisionCommentActions(DifferentialRevision $revision) {

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

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

	$viewer_has_accepted = false;
	$viewer_has_rejected = false;
	$status_accepted = DifferentialReviewerStatus::STATUS_ACCEPTED;
	$status_rejected = DifferentialReviewerStatus::STATUS_REJECTED;
	foreach ($revision->getReviewerStatus() as $reviewer) {
	if ($reviewer->getReviewerPHID() == $viewer_phid) {
	if ($reviewer->getStatus() == $status_accepted) {
	$viewer_has_accepted = true;
	}
	if ($reviewer->getStatus() == $status_rejected) {
	$viewer_has_rejected = true;
	}
	break;
	}
	}

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

	if ($viewer_is_owner) {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	$actions[DifferentialAction::ACTION_CLOSE] = true;
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	$actions[DifferentialAction::ACTION_RECLAIM] = true;
	break;
	}
	} else {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	+ $actions[DifferentialAction::ACTION_ABANDON] = $always_allow_abandon;
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	+ $actions[DifferentialAction::ACTION_ABANDON] = $always_allow_abandon;
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = !$viewer_has_rejected;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	+ $actions[DifferentialAction::ACTION_ABANDON] = $always_allow_abandon;
	$actions[DifferentialAction::ACTION_ACCEPT] = !$viewer_has_accepted;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	break;
	}
	if ($status != ArcanistDifferentialRevisionStatus::CLOSED) {
	$actions[DifferentialAction::ACTION_CLAIM] = true;
	$actions[DifferentialAction::ACTION_CLOSE] = $always_allow_close;
	}
	}

	$actions[DifferentialAction::ACTION_ADDREVIEWERS] = true;
	$actions[DifferentialAction::ACTION_ADDCCS] = true;
	$actions[DifferentialAction::ACTION_REOPEN] = $allow_reopen &&
	($status == ArcanistDifferentialRevisionStatus::CLOSED);

	$actions = array_keys(array_filter($actions));
	$actions_dict = array();
	foreach ($actions as $action) {
	$actions_dict[$action] = DifferentialAction::getActionVerb($action);
	}

	return $actions_dict;
	}

	private function loadInlineComments(
	DifferentialRevision $revision,
	array &$changesets) {
	assert_instances_of($changesets, 'DifferentialChangeset');

	$inline_comments = array();

	$inline_comments = id(new DifferentialInlineCommentQuery())
	->withRevisionIDs(array($revision->getID()))
	->withNotDraft(true)
	->execute();

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

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

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

	return $inline_comments;
	}

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

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

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

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

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

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

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

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

	$engine = PhabricatorSyntaxHighlighter::newEngine();

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

	$symbol_indexes = array();

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

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

	return array($symbol_indexes, $project_phids);
	}

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

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

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

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

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

	$query = id(new DifferentialRevisionQuery())
	->setViewer($this->getRequest()->getUser())
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
	->setLimit(10)
	->needFlags(true)
	->needDrafts(true)
	->needRelationships(true);

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

	$results = $query->execute();

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

	return $results;
	}

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

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

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

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

	return id(new PHUIObjectBoxView())
	->setHeaderText(pht('Open Revisions Affecting These Files'))
	->appendChild($view);
	}


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

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

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

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

	$diff = new DifferentialDiff();
	$diff->attachChangesets($changesets);
	$raw_changes = $diff->buildChangesList();
	$changes = array();
	foreach ($raw_changes as $changedict) {
	$changes[] = ArcanistDiffChange::newFromDictionary($changedict);
	}

	$loader = id(new PhabricatorFileBundleLoader())
	->setViewer($viewer);

	$bundle = ArcanistBundle::newFromChanges($changes);
	$bundle->setLoadFileDataCallback(array($loader, 'loadFileData'));

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

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

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

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	array(
	'name' => $file_name,
	'ttl' => (60 * 60 * 24),
	'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$file->attachToObject(
	$this->getRequest()->getUser(),
	$revision->getPHID());
	unset($unguarded);

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

	}

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

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

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

	return $timeline;
	}

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

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

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

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

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

	}
	diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
	index c26899e4ea..221f79d963 100644
	--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
	+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
	@@ -1,1705 +1,1708 @@
	<?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) {
	+ 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;
	}

	// TODO: We should write a proper Query class for this eventually.
	$changesets = id(new DifferentialChangeset())->loadAllWhere(
	'id IN (%Ld)',
	$changeset_ids);
	if ($show_context) {
	$hunk_parser = new DifferentialHunkParser();
	foreach ($changesets as $changeset) {
	$changeset->attachHunks($changeset->loadHunks());
	}
	}

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

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

	}

File Metadata

Mime Type: text/x-diff
Expires: Fri, Aug 15, 12:01 AM (3 d, 5 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 195700
Default Alt Text: (152 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions